Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

live audio mixer #30

Merged
merged 12 commits into from
May 18, 2023
Merged

live audio mixer #30

merged 12 commits into from
May 18, 2023

Conversation

Karolk99
Copy link
Contributor

No description provided.

@Karolk99 Karolk99 requested a review from mickel8 April 27, 2023 10:44
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_live_audio_mixer.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_live_audio_mixer.ex Outdated Show resolved Hide resolved
@Karolk99 Karolk99 requested a review from mickel8 May 8, 2023 12:51
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
Comment on lines +35 to +40
Defines how the mixer should act in the case when an overflow happens.
- If true, the wave will be scaled down, so a peak will become the maximal
value of the sample in the format. See `Membrane.AudioMixer.ClipPreventingAdder`.
- If false, overflow will be clipped to the maximal value of the sample in
the format. See `Membrane.AudioMixer.Adder`.
""",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do we mean by an overflow?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This option is taken from the regular audio mixer and the description is about how particular mixers work.

lib/membrane_live_audio_mixer.ex Outdated Show resolved Hide resolved
test/live_mixer/live_queue_test.exs Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
@mickel8
Copy link
Member

mickel8 commented May 9, 2023

Please don't resolve comments. They are meant to be resolved by code reviewer, accoriding to our internal contribution guide

@Karolk99 Karolk99 requested a review from mickel8 May 12, 2023 08:28
@Karolk99 Karolk99 marked this pull request as ready for review May 15, 2023 14:38
@Karolk99 Karolk99 changed the title poc version of live audio mixer live audio mixer May 15, 2023
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
test/mixer/live_queue_test.exs Outdated Show resolved Hide resolved
test/mixer/live_queue_test.exs Outdated Show resolved Hide resolved
test/mixer/audio_mixers_test.exs Outdated Show resolved Hide resolved
test/mixer/audio_mixers_test.exs Outdated Show resolved Hide resolved
test/mixer/audio_mixers_test.exs Outdated Show resolved Hide resolved
@Karolk99 Karolk99 requested a review from mickel8 May 16, 2023 17:21
Copy link
Member

@mickel8 mickel8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to solve remaining comments and we should be ready to merge

test/mixer/audio_mixers_test.exs Outdated Show resolved Hide resolved
lib/membrane_audio_mixer.ex Show resolved Hide resolved
lib/membrane_audio_mixer/live_queue.ex Outdated Show resolved Hide resolved
@Karolk99 Karolk99 requested a review from mickel8 May 17, 2023 15:19
@Karolk99 Karolk99 merged commit ccb1a40 into master May 18, 2023
@Karolk99 Karolk99 deleted the live-audio-mixer branch May 18, 2023 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants